Fix configuration cache compatibility issues #124073
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
breskeby
commented
Mar 5, 2025
breskeby
commented
- for running :plugins:discovery-ec2:check
- checking if in idea in build scan background action
- for running :plugins:discovery-ec2:check - checking if in idea in build scan background action
breskeby
added
Team:Delivery
|
Pinging @elastic/es-delivery (Team:Delivery) |
breskeby
commented
Mar 5, 2025
| } | ||
| } else { | ||
| tag 'LOCAL' | ||
| if (providers.systemProperty('idea.active').present) { |
There was a problem hiding this comment.
when running with configuration cache enabled, Project#providers is not available from a build scan background action. we can fall back to normal System.getProperty check instead as gradle instruments System.getProperty calls automatically to take into account for configuration caching.
breskeby
commented
Mar 5, 2025
| final File javaPolicy = new File(layout.buildDirectory.asFile.get(), "tmp/java.policy") | ||
| outputs.file(javaPolicy) | ||
| doLast { | ||
| final File tmp = file("${buildDir}/tmp") |
There was a problem hiding this comment.
the Project#file utility method and the buildParams extension are not available from task execution phase (e.g. running in doLast) when configuration cache enabled.
We moved declaring the output file and the inFips boolean into the configuration phase and also declared them as proper inputs/outputs for the writeTestJavaPolicy task to mark it properly as up-to-date on unchanged reruns.
Some background on this: https://docs.gradle.org/current/userguide/configuration_cache.html#config_cache:requirements
breskeby
commented
Mar 5, 2025
| // this is needed to manipulate com.amazonaws.sdk.ec2MetadataServiceEndpointOverride system property | ||
| // it is better rather disable security manager at all with `systemProperty 'tests.security.manager', 'false'` | ||
| if (buildParams.inFipsJvm){ | ||
| nonInputProperties.systemProperty 'java.security.policy', "=file://${buildDir}/tmp/java.policy" |
There was a problem hiding this comment.
Project#buildDir is a deprecated and will be removed at one point
breskeby
added
the
auto-merge-without-approval
jozala
approved these changes
Mar 5, 2025
breskeby
added a commit
to breskeby/elasticsearch
that referenced
this pull request
Mar 5, 2025
- for running :plugins:discovery-ec2:check - checking if in idea in build scan background action
breskeby
added a commit
to breskeby/elasticsearch
that referenced
this pull request
Mar 5, 2025
- for running :plugins:discovery-ec2:check - checking if in idea in build scan background action
breskeby
added a commit
to breskeby/elasticsearch
that referenced
this pull request
Mar 5, 2025
- for running :plugins:discovery-ec2:check - checking if in idea in build scan background action
breskeby
added a commit
to breskeby/elasticsearch
that referenced
this pull request
Mar 5, 2025
- for running :plugins:discovery-ec2:check - checking if in idea in build scan background action
breskeby
added a commit
to breskeby/elasticsearch
that referenced
this pull request
Mar 5, 2025
- for running :plugins:discovery-ec2:check - checking if in idea in build scan background action
elasticsearchmachine
pushed a commit
that referenced
this pull request
Mar 5, 2025
elasticsearchmachine
pushed a commit
that referenced
this pull request
Mar 5, 2025
elasticsearchmachine
pushed a commit
that referenced
this pull request
Mar 5, 2025
elasticsearchmachine
pushed a commit
that referenced
this pull request
Mar 5, 2025
breskeby
added a commit
that referenced
this pull request
Mar 5, 2025
georgewallace
pushed a commit
to georgewallace/elasticsearch
that referenced
this pull request
Mar 11, 2025
- for running :plugins:discovery-ec2:check - checking if in idea in build scan background action
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.